From 55b330d78732a27bd69135569a99bd46960a184d Mon Sep 17 00:00:00 2001 From: robertl Date: Wed, 31 Jan 2007 23:14:10 +0000 Subject: [PATCH] Regenerate autoconf and internal_styles. Comment gbversion.h life cycle. Fix dependency. git-svn-id: http://gpsbabel.googlecode.com/svn/trunk@2650 f51c46e8-681c-474f-0cfe-069cfd0219fb --- gpsbabel/Makefile.in | 2 +- gpsbabel/configure | 16 +++++++++++ gpsbabel/gbversion.h | 6 ++++ gpsbabel/gbversion.h.in | 6 ++++ gpsbabel/internal_styles.c | 56 +++++++++++++++++++++++++++++++++++--- 5 files changed, 81 insertions(+), 5 deletions(-) diff --git a/gpsbabel/Makefile.in b/gpsbabel/Makefile.in index 4f3964f1f..5a316d867 100644 --- a/gpsbabel/Makefile.in +++ b/gpsbabel/Makefile.in @@ -105,7 +105,7 @@ gpsbabel$(EXEEXT): configure Makefile $(OBJS) @GPSBABEL_DEBUG@ gpsbabel-debug: $(OBJS) $(CC) $(CFLAGS) $(LDFLAGS) $(OBJS) @LIBS@ @EFENCE_LIB@ @EXPAT_LIB@ @USB_LIBS@ $(OUTPUT_SWITCH)$@ -Makefile gbversion.h: Makefile.in config.status xmldoc/makedoc.in +Makefile gbversion.h: Makefile.in config.status xmldoc/makedoc.in gbversion.h.in CONFIG_FILES=$@ CONFIG_HEADERS= $(SHELL) ./config.status config.status: configure diff --git a/gpsbabel/configure b/gpsbabel/configure index 5acd2f539..3fe6c319c 100755 --- a/gpsbabel/configure +++ b/gpsbabel/configure @@ -3173,6 +3173,11 @@ else xpathdr=/sw/include/ fi ;; + *-*-freebsd*) + if test -f /usr/local/include/expat.h ; then + xpathdr=/usr/local/include + fi + ;; *) ;; esac @@ -3204,6 +3209,17 @@ cat >>confdefs.h <<\_ACEOF _ACEOF + fi + ;; + *-*-freebsd*) + if test -f /usr/local/lib/libexpat.a ; then + EXPAT_LIB=/usr/local/lib/libexpat.a + +cat >>confdefs.h <<\_ACEOF +#define HAVE_LIBEXPAT 1 +_ACEOF + + fi ;; *) diff --git a/gpsbabel/gbversion.h b/gpsbabel/gbversion.h index c1075bd69..e7f12b5e4 100644 --- a/gpsbabel/gbversion.h +++ b/gpsbabel/gbversion.h @@ -1,2 +1,8 @@ +/* + * gbversion.h is generated from gbversion.h.in which uses autoconf voodoo + * to get the version number from configure.in. + * + * Isn't simplification via automation grand? + */ #define VERSION "1.3.3-beta20061125" diff --git a/gpsbabel/gbversion.h.in b/gpsbabel/gbversion.h.in index cb98510ac..db491f99e 100644 --- a/gpsbabel/gbversion.h.in +++ b/gpsbabel/gbversion.h.in @@ -1,2 +1,8 @@ +/* + * gbversion.h is generated from gbversion.h.in which uses autoconf voodoo + * to get the version number from configure.in. + * + * Isn't simplification via automation grand? + */ #define VERSION "@GBMAJOR@.@GBMINOR@.@GBMICRO@@PACKAGE_RELEASE@" diff --git a/gpsbabel/internal_styles.c b/gpsbabel/internal_styles.c index 00e762b14..17d3078eb 100644 --- a/gpsbabel/internal_styles.c +++ b/gpsbabel/internal_styles.c @@ -439,8 +439,8 @@ static char gpsdrivetrack[] = "IFIELD ALT_METERS, \"\", \"%10.0f\"\n" "# Reports are that this format stores in local time, not GMT as \n" "# originally thought.\n" -"# IFIELD GMT_TIME, \"\", \"%a %b %d %T %Y\"\n" -"IFIELD LOCAL_TIME, \"\", \"%a %b %d %T %Y\"\n" +"# IFIELD GMT_TIME, \"\", \"%a %b %d %H:%M:%S %Y\"\n" +"IFIELD LOCAL_TIME, \"\", \"%a %b %d %H:%M:%S %Y\"\n" ; static char gpsman[] = "# gpsbabel XCSV style file\n" @@ -478,6 +478,54 @@ static char gpsman[] = "# gpsman.c likes mkshort len = 8, whitespace = 0.\n" ; +static char kompass_tk[] = +"# gpsbabel XCSV style file\n" +"#\n" +"# Format: Kompass / Deutscher Alpenverein (DAV) Waypoints\n" +"# Author: Olaf Klein\n" +"# Date: 01/10/2007\n" +"#\n" +"# \n" +"DESCRIPTION Kompass (DAV) Track (.tk)\n" +"DATATYPE TRACK\n" +"EXTENSION wp\n" +"FIELD_DELIMITER COMMA\n" +"RECORD_DELIMITER NEWLINE\n" +"BADCHARS ,\"\n" +"#\n" +"# INDIVIDUAL DATA FIELDS, IN ORDER OF APPEARANCE:\n" +"#\n" +"IFIELD LAT_DECIMAL, \"\", \"%.7f\"\n" +"IFIELD LON_DECIMAL, \"\", \"%.7f\"\n" +; +static char kompass_wp[] = +"# gpsbabel XCSV style file\n" +"#\n" +"# Format: Kompass / Deutscher Alpenverein (DAV) Waypoints\n" +"# Author: Olaf Klein\n" +"# Date: 01/10/2007\n" +"#\n" +"# \n" +"DESCRIPTION Kompass (DAV) Waypoints (.wp)\n" +"DATATYPE WAYPOINT\n" +"EXTENSION wp\n" +"ENCODING UTF-8\n" +"FIELD_DELIMITER SEMICOLON\n" +"RECORD_DELIMITER CRNEWLINE\n" +"BADCHARS ,\"\n" +"#\n" +"# INDIVIDUAL DATA FIELDS, IN ORDER OF APPEARANCE:\n" +"#\n" +"IFIELD SHORTNAME, \"\", \"%s\"\n" +"IFIELD LON_DECIMAL, \"\", \"%.7f\"\n" +"IFIELD LAT_DECIMAL, \"\", \"%.7f\"\n" +"IFIELD ALT_METERS, \"\", \"%.0f\"\n" +"IFIELD LOCAL_TIME,\"\",\"%d.%m.%Y %H:%M:%S\"\n" +"IFIELD CONSTANT, \"Icons\\Wegpunkt grün.bmp\", \"%s\"\n" +"IFIELD IGNORE, \"\", \"%s\"\n" +"IFIELD CONSTANT, \"1\", \"%s\" # unknown\n" +"IFIELD DESCRIPTION, \"\", \"%s\"\n" +; static char ktf2[] = "# gpsbabel XCSV style file\n" "#\n" @@ -1000,8 +1048,8 @@ static char xmapwpt[] = "IFIELD IGNORE, \"\", \"%-.31s\"\n" "IFIELD DESCRIPTION, \"\", \"%-.78s\"\n" ; -style_vecs_t style_list[] = {{ "xmapwpt", xmapwpt } , { "xmap", xmap } , { "xmap2006", xmap2006 } , { "tabsep", tabsep } , { "sportsim", sportsim } , { "saplus", saplus } , { "s_and_t", s_and_t } , { "openoffice", openoffice } , { "nima", nima } , { "mxf", mxf } , { "mapconverter", mapconverter } , { "kwf2", kwf2 } , { "ktf2", ktf2 } , { "gpsman", gpsman } , { "gpsdrivetrack", gpsdrivetrack } , { "gpsdrive", gpsdrive } , { "geonet", geonet } , { "garmin_poi", garmin_poi } , { "garmin301", garmin301 } , { "fugawi", fugawi } , { "dna", dna } , { "custom", custom } , { "cup", cup } , { "csv", csv } , { "cambridge", cambridge } , { "arc", arc } , {0,0}}; -size_t nstyles = 26; +style_vecs_t style_list[] = {{ "xmapwpt", xmapwpt } , { "xmap", xmap } , { "xmap2006", xmap2006 } , { "tabsep", tabsep } , { "sportsim", sportsim } , { "saplus", saplus } , { "s_and_t", s_and_t } , { "openoffice", openoffice } , { "nima", nima } , { "mxf", mxf } , { "mapconverter", mapconverter } , { "kwf2", kwf2 } , { "ktf2", ktf2 } , { "kompass_wp", kompass_wp } , { "kompass_tk", kompass_tk } , { "gpsman", gpsman } , { "gpsdrivetrack", gpsdrivetrack } , { "gpsdrive", gpsdrive } , { "geonet", geonet } , { "garmin_poi", garmin_poi } , { "garmin301", garmin301 } , { "fugawi", fugawi } , { "dna", dna } , { "custom", custom } , { "cup", cup } , { "csv", csv } , { "cambridge", cambridge } , { "arc", arc } , {0,0}}; +size_t nstyles = 28; #else /* CSVFMTS_ENABLED */ style_vecs_t style_list[] = {{0,0}}; size_t nstyles = 0; -- 2.30.2